Initialize the XAtom cache earlier. Patch by Christian Persch

        * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize the
        XAtom cache earlier. Patch by Christian Persch

svn path=/trunk/; revision=21880

diff --git a/ChangeLog b/ChangeLog
index 4c6f4d855238fd78451cfe3d175c88c724ff253a..d7978525c2200433aa6f9601652559e1f39c0449 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-13  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 563751 – xatom cache is prefilled too late
+
+       * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize the
+       XAtom cache earlier. Patch by Christian Persch
+
 2008-12-13  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 564212 – gtk_icon_view_accessible_model_rows_reordered explain 

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 0293f92c48b014c143e4cbed6a64dfc8880376d4..87a5200498d0fab79ddfc3949ab0b3ade3d12ead 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -181,6 +181,8 @@ gdk_display_open (const gchar *display_name)
   XAddConnectionWatch (xdisplay, gdk_internal_connection_watch, NULL);
 #endif /* HAVE_X11R6 */
   
+  _gdk_x11_precache_atoms (display, precache_atoms, G_N_ELEMENTS (precache_atoms));
+
   /* RandR must be initialized before we initialize the screens */
   display_x11->have_randr12 = FALSE;
 #ifdef HAVE_RANDR
@@ -218,8 +220,6 @@ gdk_display_open (const gchar *display_name)
   attr.height = 10;
   attr.event_mask = 0;
 
-  _gdk_x11_precache_atoms (display, precache_atoms, G_N_ELEMENTS (precache_atoms));
-
   display_x11->leader_gdk_window = gdk_window_new (GDK_SCREEN_X11 (display_x11->default_screen)->root_window, 
                                                   &attr, GDK_WA_X | GDK_WA_Y);
   (_gdk_x11_window_get_toplevel (display_x11->leader_gdk_window))->is_leader = TRUE;